Merge branch 'main' into bugfix/168-renamed-list-plugin-for-cke-v41

# Conflicts:
#	src/web/assets/ckeditor/dist/ckeditor5-craftcms.js
#	src/web/assets/ckeditor/dist/ckeditor5-craftcms.js.map

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release Notes for CKEditor for Craft CMS
 
+## Unreleased
+
+- Added support for creating anchor links. ([#169](https://github.com/craftcms/ckeditor/discussions/169))
+- Improved accessibility for screen readers. ([#74](https://github.com/craftcms/ckeditor/issues/74), [#166](https://github.com/craftcms/ckeditor/pull/166))
+- Fixed a bug where resized images weren’t getting updated `width` and `height` attributes. ([#165](https://github.com/craftcms/ckeditor/pull/165))
+
 ## 3.7.3 - 2024-02-08
 
 - Fixed a JavaScript error. ([#161](https://github.com/craftcms/ckeditor/issues/161))

package.json

@@ -42,6 +42,7 @@
     "@ckeditor/ckeditor5-word-count": ">=41.0.0",
     "@craftcms/sass": "^1.1.0",
     "@craftcms/webpack": "^1.1.2",
+    "@northernco/ckeditor5-anchor-drupal": "^0.5.0",
     "ckeditor5": ">=41.0.0",
     "copy-webpack-plugin": "^12.0.2",
     "husky": "^9.0.10",

src/Field.php

@@ -317,6 +317,8 @@ protected function inputHtml(mixed $value, ElementInterface $element = null): st
         $baseConfig = [
             'defaultTransform' => $defaultTransform?->handle,
             'elementSiteId' => $element?->siteId,
+            'accessibleFieldName' => $this->_accessibleFieldName($element),
+            'describedBy' => $this->_describedBy($view),
             'findAndReplace' => [
                 'uiType' => 'dropdown',
             ],
@@ -910,4 +912,38 @@ private function _adjustPurifierConfig(HTMLPurifier_Config $purifierConfig): HTM
 
         return $purifierConfig;
     }
+
+    /**
+     * Returns an accessible name for the field (to be plugged into CKEditor's main editing area aria-label).
+     *
+     * @param ElementInterface|null $element
+     * @return string
+     */
+    private function _accessibleFieldName(?ElementInterface $element = null): string
+    {
+        return Craft::t('site', $this->name) .
+        ($element?->getFieldLayout()?->getField($this->handle)?->required ? ' ' . Craft::t('site', 'Required') : '') .
+        ($this->getIsTranslatable($element) ? ' ' . $this->getTranslationDescription($element) : '');
+    }
+
+    /**
+     * Namespaces field's $describedBy value to be passed to the field.
+     *
+     * @param View $view
+     * @return string
+     */
+    private function _describedBy(View $view): string
+    {
+        if (!empty($this->describedBy)) {
+            $describedByArray = explode(' ', $this->describedBy);
+            $namespace = trim(preg_replace('/\[|\]/', '-', $view->getNamespace()), '-');
+            foreach ($describedByArray as $key => $item) {
+                $describedByArray[$key] = "$namespace-$item";
+            }
+
+            return implode(' ', $describedByArray);
+        }
+
+        return '';
+    }
 }

src/controllers/CkeditorController.php

@@ -46,6 +46,8 @@ public function actionImageUrl(): Response
 
         return $this->asJson([
             'url' => $asset->getUrl($transform, false),
+            'width' => $asset->getWidth($transform),
+            'height' => $asset->getHeight($transform),
         ]);
     }
 }

src/web/assets/ckeditor/dist/ckeditor5-craftcms.js.LICENSE.txt

@@ -10,6 +10,16 @@
 
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 
+/**
+ * @license Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+/**
+ * @license Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
 /**
  * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license