Merge branch 'develop' into 4.3

# Conflicts:
#	src/web/assets/cp/dist/css/cp.css
#	src/web/assets/cp/dist/css/cp.css.map
#	src/web/assets/cp/src/css/_preview.scss
#	src/web/assets/craftsupport/dist/css/CraftSupportWidget.css.map
#	src/web/assets/dashboard/dist/css/Dashboard.css.map
#	src/web/assets/edittransform/dist/css/transforms.css.map
#	src/web/assets/edituser/dist/css/AccountSettingsForm.css.map
#	src/web/assets/edituser/dist/css/profile.css.map
#	src/web/assets/generalsettings/dist/css/rebrand.css.map
#	src/web/assets/graphiql/dist/css/graphiql.css.map
#	src/web/assets/installer/dist/css/install.css.map
#	src/web/assets/login/dist/css/login.css.map
#	src/web/assets/money/dist/css/Money.css.map
#	src/web/assets/plugins/dist/css/PluginManager.css.map
#	src/web/assets/pluginstore/dist/css/app.css.map
#	src/web/assets/pluginstoreoauth/dist/css/PluginStoreOauthCallback.css.map
#	src/web/assets/routes/dist/css/routes.css.map
#	src/web/assets/systemmessages/dist/css/system_messages.css.map
#	src/web/assets/updater/dist/css/Updater.css.map
#	src/web/assets/updates/dist/css/UpdatesUtility.css.map
#	src/web/assets/upgrade/dist/css/UpgradeUtility.css.map
#	src/web/assets/userpermissions/dist/css/UserPermissions.css.map
#	src/web/assets/utilities/dist/css/utilities.css.map

CHANGELOG.md

@@ -13,6 +13,9 @@
 ### Changed
 - When passing a PHP callback function to the `--to` option of a `resave/*` command, the `$element` argument is now optional.
 
+### Deprecated
+- Deprecated `craft\web\assets\focusvisible\FocusVisibleAsset`. ([#12037](https://github.com/craftcms/cms/pull/12037))
+
 ### Fixed
 - Fixed an error that could occur when editing a draft of an element type that didn’t have change tracking enabled.
 - Fixed an error that could occur when saving an entry with Matrix blocks, if the entry had been deleted for a site.
@@ -25,6 +28,7 @@
 - Fixed a bug where “Propagating tags” jobs would fail if two tags had similar titles.
 - Fixed a bug where pressing “Disable focal point” within asset preview modals would only reset the focal point position, but not delete it. ([#12030](https://github.com/craftcms/cms/issues/12030))
 - Fixed a bug where image transforms weren’t getting sized correctly in some cases when `upscaleImages` was disabled. ([#12023](https://github.com/craftcms/cms/issues/12023))
+- Fixed a bug where table cells within Redactor fields could appear to be focused when they weren’t. ([#12001](https://github.com/craftcms/cms/issues/12001), [#12037](https://github.com/craftcms/cms/pull/12037))
 
 ### Security
 - Reduced the amount of system information that’s available to guest users.

package.json

@@ -39,7 +39,6 @@
     "element-resize-detector": "^1.2.4",
     "event-stream": "3.3.5",
     "fabric": "^1.7.19",
-    "focus-visible": "^5.2.0",
     "graphiql": "~1.7.2",
     "graphiql-explorer": "^0.9.0",
     "graphql": "^15.8.0",

packages/craftcms-sass/_mixins.scss

@@ -171,7 +171,7 @@ $radioSize: 16px;
 
 @mixin focus-styles {
   body:not(.reduce-focus-visibility) &:focus,
-  body.reduce-focus-visibility &.focus-visible {
+  body.reduce-focus-visibility &:focus-visible {
     @content;
   }
 }

src/web/assets/cp/CpAsset.php

@@ -28,7 +28,6 @@
 use craft\web\assets\elementresizedetector\ElementResizeDetectorAsset;
 use craft\web\assets\fabric\FabricAsset;
 use craft\web\assets\fileupload\FileUploadAsset;
-use craft\web\assets\focusvisible\FocusVisibleAsset;
 use craft\web\assets\garnish\GarnishAsset;
 use craft\web\assets\iframeresizer\IframeResizerAsset;
 use craft\web\assets\jquerypayment\JqueryPaymentAsset;
@@ -60,7 +59,6 @@ class CpAsset extends AssetBundle
         AxiosAsset::class,
         D3Asset::class,
         ElementResizeDetectorAsset::class,
-        FocusVisibleAsset::class,
         GarnishAsset::class,
         JqueryAsset::class,
         JqueryTouchEventsAsset::class,

src/web/assets/cp/src/css/_cp.scss

@@ -41,11 +41,11 @@ body {
 }
 
 .reduce-focus-visibility {
-  :focus:not(.focus-visible) {
+  :focus:not(:focus-visible) {
     box-shadow: none;
   }
 
-  .focus-visible {
+  :focus-visible {
     box-shadow: var(--focus-ring);
   }
 }

src/web/assets/cp/src/css/_main.scss

@@ -1861,7 +1861,7 @@ div.btn.submit input {
     background-color: transparentize($grey200, 0.9);
     border-color: transparent;
 
-    .reduce-focus-visibility &:not(.focus-visible) {
+    .reduce-focus-visibility &:not(:focus-visible) {
       border: 1px dashed var(--medium-hairline-color);
     }
   }
@@ -2119,7 +2119,7 @@ div.btn.submit input {
         }
       }
 
-      &.focus-visible {
+      @include focus-styles {
         box-shadow: inset 0 0 0 1px var(--hairline-color), var(--focus-ring);
       }
     }
@@ -3671,7 +3671,7 @@ ul.tree,
         text-decoration: none;
       }
 
-      &.focus-visible {
+      @include focus-styles {
         box-shadow: none;
 
         .tab-label {
@@ -5252,8 +5252,7 @@ $min2ColWidth: 400px;
       @include disclosure-link-hover-styles;
     }
 
-    body:not(.reduce-focus-visibility) &:focus,
-    body.reduce-focus-visibility &.focus-visible {
+    @include focus-styles {
       box-shadow: inset 0 0 0 3px hsla(var(--dark-focus-hsl), 0.7);
     }
   }
@@ -5387,8 +5386,7 @@ table.editable {
     @include input-focused-styles;
   }
 
-  body:not(.reduce-focus-visibility) &:focus,
-  body.reduce-focus-visibility &.focus-visible {
+  @include focus-styles {
     @include input-focused-styles;
   }
 }
@@ -5744,8 +5742,8 @@ body:not(.reduce-focus-visibility) {
 }
 
 body.reduce-focus-visibility {
-  input.checkbox.focus-visible + label:before,
-  .focus-visible div.checkbox:before {
+  input.checkbox:focus-visible + label:before,
+  :focus-visible div.checkbox:before {
     @include input-focused-styles;
   }
 }
@@ -5759,8 +5757,7 @@ body.reduce-focus-visibility {
 }
 
 .monaco-mouse-cursor-text {
-  &:focus,
-  &.focus-visible {
+  @include focus-styles {
     box-shadow: none !important;
   }
 }
@@ -5861,8 +5858,8 @@ body:not(.reduce-focus-visibility) {
 }
 
 body.reduce-focus-visibility {
-  input.radio.focus-visible + label:before,
-  .focus-visible div.radio:before {
+  input.radio:focus-visible + label:before,
+  :focus-visible div.radio:before {
     @include input-focused-styles;
   }
 }
@@ -5873,8 +5870,7 @@ body.reduce-focus-visibility {
   font-size: 14px;
   appearance: none;
 
-  body:not(.reduce-focus-visibility) &:focus,
-  body.reduce-focus-visibility &.focus-visible {
+  @include focus-styles {
     @include input-focused-styles;
   }
 
@@ -6223,8 +6219,7 @@ tr.indexingSession td.progress div.progressContainer div.progressInfo {
     @include select-input-focused-styles;
   }
 
-  body:not(.reduce-focus-visibility) &:focus,
-  body.reduce-focus-visibility &.focus-visible {
+  @include focus-styles {
     @include select-input-focused-styles;
   }
 }

src/web/assets/focusvisible/FocusVisibleAsset.php

@@ -11,14 +11,9 @@
 
 /**
  * Focus visible asset bundle.
+ *
+ * @deprecated in 4.2.6.
  */
 class FocusVisibleAsset extends AssetBundle
 {
-    /** @inheritdoc */
-    public $sourcePath = __DIR__ . '/dist';
-
-    /** @inheritdoc */
-    public $js = [
-        'focus-visible.js',
-    ];
 }