lexxy 0.1.26.beta → 0.7.1.beta

data/app/assets/stylesheets/lexxy-content.css

@@ -64,6 +64,10 @@
     font-style: italic;
     margin: var(--lexxy-content-margin) 0;
     padding: 0.5lh 2ch;
+
+    p:last-child {
+      margin-block-end: 0;
+    }
   }
 
   p:empty {
@@ -125,6 +129,7 @@
 
   /* Keywords and attributes */
   .code-token__attr,
+  .token.attr-name,
   .token.atrule,
   .token.attr,
   .token.keyword {
@@ -144,6 +149,7 @@
 
   /* Strings, selectors, and built-in constructs */
   .code-token__selector,
+  .token.attr-value,
   .token.builtin,
   .token.char,
   .token.inserted,
@@ -198,6 +204,7 @@
 
   /* Tables */
   :where(.lexxy-content__table-wrapper) {
+    margin: 0;
     margin-block: 1ch;
     overflow-x: auto;
   }
@@ -233,14 +240,6 @@
   }
 }
 
-:where([data-lexical-cursor]) {
-  animation: blink 1s step-end infinite;
-  block-size: 1lh;
-  border-inline-start: 1px solid currentColor;
-  line-height: inherit;
-  margin-block: 1em;
-}
-
 /* Attachments
 /* ------------------------------------------------------------------------ */
 

data/app/assets/stylesheets/lexxy-editor.css

@@ -54,15 +54,17 @@
   }
 
   table {
-    .table-cell--selected {
-      background-color: var(--lexxy-color-table-cell-selected-bg) !important;
-    }
+    th, td {
+      &.table-cell--selected {
+        background-color: var(--lexxy-color-table-cell-selected-bg);
+      }
 
-    .lexxy-content__table-cell--selected {
-      background-color: var(--lexxy-color-table-cell-selected-bg) !important;
-      border-color: var(--lexxy-color-table-cell-selected-border) !important;
+      &.lexxy-content__table-cell--selected {
+        background-color: var(--lexxy-color-table-cell-selected-bg);
+        border-color: var(--lexxy-color-table-cell-selected-border);
+      }
     }
-  
+ 
     &.lexxy-content__table--selection {
       ::selection {
         background: transparent;
@@ -100,6 +102,20 @@
   outline: 2px dashed var(--lexxy-color-selected-dark);
 }
 
+:where([data-lexical-cursor]) {
+  animation: blink 1s infinite;
+  block-size: 1lh;
+  border-inline-start: 1.5px solid currentColor;
+  line-height: inherit;
+  margin-block: 0 var(--lexxy-content-margin);
+}
+
+@keyframes blink {
+  0% { opacity: 1; }
+  60% { opacity: 1; }
+  100% { opacity: 0;}
+}
+
 /* Toolbar
 /* -------------------------------------------------------------------------- */
 
@@ -376,73 +392,10 @@
   }
 }
 
-/* Table dropdown
-/* -------------------------------------------------------------------------- */
-
-:where(lexxy-table-dropdown) {
-  display: flex;
-  flex-direction: column;
-  gap: 1ch;
-  
-  .lexxy-editor__table-create {
-    display: flex;
-    flex-direction: column;
-    flex-wrap: wrap;
-    gap: 0;
-
-    .lexxy-editor__table-buttons {
-      background-color: var(--lexxy-color-ink-lighter);
-      display: flex;
-      flex-direction: column;
-      gap: 1px;
-      padding: 1px;
-
-      div {
-        display: flex;
-        flex-direction: row;
-        gap: 1px;
-      }
-
-      button {
-        aspect-ratio: 1.5 / 1;
-        border: 0;
-        border-radius: 0;
-        color: var(--lexxy-color-ink);
-        font-family: var(--lexxy-font-base);
-        font-size: var(--lexxy-text-small);
-        font-weight: normal;
-        inline-size: 4ch;
-        margin: 0;
-
-        &.active {
-          background-color: var(--lexxy-color-ink-lightest);
-        }
-      }
-    }
-
-    label {
-      align-items: center;
-      display: flex;
-      gap: 0.5ch;
-      padding: 0.5ch 0;
-      margin-block-start: 1ch;
-    }
-
-    &:has(input[type="checkbox"]:checked) {
-      .lexxy-editor__table-buttons {
-        div:first-child button,
-        button:first-child {
-          filter: brightness(0.95);
-        }
-      }
-    }
-  }
-}
-
 /* Table handle buttons
 /* -------------------------------------------------------------------------- */
 
-:where(.lexxy-table-handle-buttons) {
+:where(lexxy-table-handler) {
   --button-size: 2.5lh;
 
   color: var(--lexxy-color-ink-inverted);
@@ -453,7 +406,7 @@
   line-height: 1;
   position: absolute;
   transform: translate(-50%, -120%);
-  z-index: 10;
+  z-index: 2;
 
   .lexxy-table-control {
     align-items: center;
@@ -465,7 +418,8 @@
     padding: 2px;
     white-space: nowrap;
 
-    button {
+    button,
+    summary {
       aspect-ratio: 1 / 1;
       align-items: center;
       background-color: transparent;
@@ -477,14 +431,21 @@
       font-weight: bold;
       justify-content: center;
       line-height: 1;
+      list-style: none;
       min-block-size: var(--button-size);
       min-inline-size: var(--button-size);
       padding: 0;
+      user-select: none;
+      -webkit-user-select: none;
 
       &:hover {
         background-color: var(--lexxy-color-ink-medium);
       }
 
+      &:focus-visible {
+        outline-color: var(--lexxy-focus-ring-color);
+      }
+
       svg {
         block-size: 1em;
         inline-size: 1em;
@@ -495,47 +456,17 @@
         display: none;
       }
     }
-
-    button,
-    summary {
-      &:focus,
-      &:focus-visible {
-        background-color: var(--lexxy-color-ink-medium);
-        outline: var(--lexxy-focus-ring-size) solid var(--lexxy-focus-ring-color);
-        outline-offset: var(--lexxy-focus-ring-offset);
-      }
-    }
   }
 
   .lexxy-table-control__more-menu {
     gap: 0;
-    padding: 2px;
+    padding: 0.25ch;
     position: relative;
     
     summary {
-      aspect-ratio: 1 / 1;
-      align-items: center;
-      background: transparent;
-      border-radius: var(--lexxy-radius);
-      border: 0;
-      box-sizing: border-box;
-      display: flex;
-      font-size: inherit;
-      justify-content: center;
-      list-style: none;
-      min-block-size: var(--button-size);
-      min-inline-size: var(--button-size);
-      padding: 0;
-      user-select: none;
-      -webkit-user-select: none;
-
       &::-webkit-details-marker {
         display: none;
       }
-
-      &:hover {
-        background: var(--lexxy-color-ink-medium);
-      }
     }
 
     .lexxy-table-control__more-menu-details {
@@ -552,7 +483,7 @@
         border-radius: 0.75ch;
         display: flex;
         flex-direction: column;
-        padding: 2px;
+        padding: 0.25ch;
       }
 
       button {
@@ -585,28 +516,32 @@
 /* Language picker
 /* -------------------------------------------------------------------------- */
 
-:where(.lexxy-code-language-picker) {
-  -webkit-appearance: none;
-  appearance: none;
-  background-color: var(--lexxy-color-canvas);
-  background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m12 19.5c-.7 0-1.3-.3-1.7-.8l-9.8-11.1c-.7-.8-.6-1.9.2-2.6.8-.6 1.9-.6 2.5.2l8.6 9.8c0 .1.2.1.4 0l8.6-9.8c.7-.8 1.8-.9 2.6-.2s.9 1.8.2 2.6l-9.8 11.1c-.4.5-1.1.8-1.7.8z' fill='%23000'/%3E%3C/svg%3E");
-  background-position: center right 1ch;
-  background-repeat: no-repeat;
-  background-size: 1ch;
-  block-size: 1.5lh;
-  border: 1px solid var(--lexxy-color-ink-lighter);
-  border-radius: var(--lexxy-radius);
-  color: var(--lexxy-color-ink);
-  font-family: var(--lexxy-font-base);
-  font-size: var(--lexxy-text-small);
-  font-weight: normal;
+:where(lexxy-code-language-picker) {
   inset-inline-end: var(--lexxy-editor-padding);
-  margin: 0.5ch 0.5ch 0 -0.5ch;
-  padding: 0 2ch 0 1ch;
-  text-align: start;
+  position: absolute;
 
-  @media (prefers-color-scheme: dark) {
-    background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m12 19.5c-.7 0-1.3-.3-1.7-.8l-9.8-11.1c-.7-.8-.6-1.9.2-2.6.8-.6 1.9-.6 2.5.2l8.6 9.8c0 .1.2.1.4 0l8.6-9.8c.7-.8 1.8-.9 2.6-.2s.9 1.8.2 2.6l-9.8 11.1c-.4.5-1.1.8-1.7.8z' fill='%23fff'/%3E%3C/svg%3E");
+  select {
+    -webkit-appearance: none;
+    appearance: none;
+    background-color: var(--lexxy-color-canvas);
+    background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m12 19.5c-.7 0-1.3-.3-1.7-.8l-9.8-11.1c-.7-.8-.6-1.9.2-2.6.8-.6 1.9-.6 2.5.2l8.6 9.8c0 .1.2.1.4 0l8.6-9.8c.7-.8 1.8-.9 2.6-.2s.9 1.8.2 2.6l-9.8 11.1c-.4.5-1.1.8-1.7.8z' fill='%23000'/%3E%3C/svg%3E");
+    background-position: center right 1ch;
+    background-repeat: no-repeat;
+    background-size: 1ch;
+    block-size: 1.5lh;
+    border: 1px solid var(--lexxy-color-ink-lighter);
+    border-radius: var(--lexxy-radius);
+    color: var(--lexxy-color-ink);
+    font-family: var(--lexxy-font-base);
+    font-size: var(--lexxy-text-small);
+    font-weight: normal;
+    margin: 0.5ch 0.5ch 0 -0.5ch;
+    padding: 0 2ch 0 1ch;
+    text-align: start;
+
+    @media (prefers-color-scheme: dark) {
+      background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m12 19.5c-.7 0-1.3-.3-1.7-.8l-9.8-11.1c-.7-.8-.6-1.9.2-2.6.8-.6 1.9-.6 2.5.2l8.6 9.8c0 .1.2.1.4 0l8.6-9.8c.7-.8 1.8-.9 2.6-.2s.9 1.8.2 2.6l-9.8 11.1c-.4.5-1.1.8-1.7.8z' fill='%23fff'/%3E%3C/svg%3E");
+    }
   }
 }
 

data/config/ci.rb

@@ -4,8 +4,9 @@ CI.run do
   step "Style: Ruby", "bin/rubocop -f github"
   step "Style: JavaScript", "yarn lint"
 
-  step "Tests: prepare", "env RAILS_ENV=test bin/rails db:test:prepare"
-  step "Tests: run", "env RAILS_ENV=test bin/rails test:all -d"
+  step "Tests: JavaScript", "yarn test"
+  step "Tests: Rails (prepare)", "env RAILS_ENV=test bin/rails db:test:prepare"
+  step "Tests: Rails (run)", "env RAILS_ENV=test bin/rails test:all -d"
 
   unless success?
     failure "Signoff: CI failed.", "Fix the issues and try again."

data/lib/lexxy/rich_text_area_tag.rb

@@ -25,6 +25,7 @@ module Lexxy
       def render_custom_attachments_in(value)
         if value.respond_to?(:body)
           if html = value.body_before_type_cast.presence
+            self.prefix_partial_path_with_controller_namespace = false if respond_to?(:prefix_partial_path_with_controller_namespace=)
             ActionText::Fragment.wrap(html).replace(ActionText::Attachment.tag_name) do |node|
               if node["url"].blank?
                 attachment = ActionText::Attachment.from_node(node)

data/lib/lexxy/version.rb

@@ -1,3 +1,3 @@
 module Lexxy
-  VERSION = "0.1.26.beta"
+  VERSION = "0.7.1.beta"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lexxy
 version: !ruby/object:Gem::Version
-  version: 0.1.26.beta
+  version: 0.7.1.beta
 platform: ruby
 authors:
 - Jorge Manrubia