Merge pull request #2909 from basecamp/update-lexxy

Upgrade lexxy to 0.9.14.beta

Author: flavorjones

Gemfile

@@ -27,7 +27,7 @@ gem "geared_pagination", "~> 1.2"
 gem "rqrcode"
 gem "rouge"
 gem "jbuilder"
-gem "lexxy", "0.9.5.beta"
+gem "lexxy", "0.9.14.beta"
 gem "image_processing", "~> 1.14"
 gem "platform_agent"
 gem "aws-sdk-s3", require: false

Gemfile.lock

@@ -234,7 +234,7 @@ GEM
       activesupport (>= 7.0.0)
     jmespath (1.6.2)
     json (2.19.3)
-    jwt (3.1.2)
+    jwt (3.2.0)
       base64
     kamal (2.11.0)
       activesupport (>= 7.0)
@@ -254,7 +254,7 @@ GEM
       logger (~> 1.6)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
-    lexxy (0.9.5.beta)
+    lexxy (0.9.14.beta)
       rails (>= 8.0.2)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -518,7 +518,7 @@ DEPENDENCIES
   jbuilder
   kamal
   letter_opener
-  lexxy (= 0.9.5.beta)
+  lexxy (= 0.9.14.beta)
   mission_control-jobs
   mittens
   mocha

Gemfile.saas.lock

@@ -346,7 +346,7 @@ GEM
       activesupport (>= 7.0.0)
     jmespath (1.6.2)
     json (2.19.3)
-    jwt (3.1.2)
+    jwt (3.2.0)
       base64
     kamal (2.11.0)
       activesupport (>= 7.0)
@@ -366,7 +366,7 @@ GEM
       logger (~> 1.6)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
-    lexxy (0.9.5.beta)
+    lexxy (0.9.14.beta)
       rails (>= 8.0.2)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -723,7 +723,7 @@ DEPENDENCIES
   jbuilder
   kamal
   letter_opener
-  lexxy (= 0.9.5.beta)
+  lexxy (= 0.9.14.beta)
   mission_control-jobs
   mittens
   mocha

app/assets/stylesheets/lexxy.css

@@ -65,11 +65,12 @@
     }
   }
 
-  .lexxy-editor__toolbar-button {
+  /* Exclude the link dropdown's action buttons — they keep the gem's accent/gray background. */
+  .lexxy-editor__toolbar-button:not(.lexxy-editor__toolbar-dropdown-actions *) {
     background: transparent;
 
     &[aria-pressed="true"],
-    [open] > & {
+    &[aria-expanded="true"] {
       background-color: oklch(var(--lch-blue-medium) / 20%);
     }
 
@@ -80,17 +81,19 @@
     }
   }
 
-  .lexxy-editor__toolbar-dropdown--chevron {
-    summary:after {
+  .lexxy-editor__toolbar-button--chevron {
+    &:after {
       block-size: 0.3rem;
       inline-size: 0.3rem;
     }
   }
 
   lexxy-link-dropdown {
-    --lexxy-toolbar-spacing: 1.5ch;
+    [data-dropdown-panel] {
+      --lexxy-toolbar-spacing: 1.5ch;
+    }
 
-    .lexxy-editor__toolbar-button {
+    .lexxy-editor__toolbar-dropdown-actions .lexxy-editor__toolbar-button {
       border-radius: 99rem;
 
       @media(any-hover: hover) {
@@ -100,12 +103,16 @@
         }
       }
 
-      &[type="submit"],
-      &[type="submit"]:hover {
+      &[value="link"] {
         background-color: var(--color-link);
+        color: var(--color-ink-inverted);
+
+        &:hover {
+          background-color: var(--color-link);
+        }
       }
 
-      &[type="button"] {
+      &[value="unlink"] {
         border: 1px solid var(--color-ink-light);
       }
     }