trek 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc939de6d6cc669e8faa27134dd868b9523bafa0236e1cf025673e0abb84d833
-  data.tar.gz: 6abb5b7e49ee16d38619f6831d62dda2a05871b09a81f9ea8d44021254a91774
+  metadata.gz: 1ea15f7b7f4c1da74cdda11ad651158cd69856a5a04490e417ed90c80886cc0a
+  data.tar.gz: e6bc99bac1a371ee03737a217f9f621e430f8db8ebb4dcaeba5494e224608970
 SHA512:
-  metadata.gz: 69f4c70a9471eb21966c377cb419e98a314ecac4aeac31dc1f78501e8241450870de557ab77eadc2acc11fa5532193b8db3646406b8dbdee7780355c1e255483
-  data.tar.gz: 0c71c307f076c1c601ac37a1b016cc2508fcc78b56fbd114fd7769dce928581ff0daffb22c2f62c011e85fb6a9b8cf6445616c7d47b793538af516f15d01f781
+  metadata.gz: 2742e782830532e67f36d3affb40723858b5533cf798cc4ea729028cda798b1a447cef87690d15ae148882048489d811a9df4cce3394c5bb1ade7d1aede7e64f
+  data.tar.gz: 19a823e2bbdf69d076aa82ec75db839dfe78668faad9c07a63cf08066465899f15033099629dcdb7740c4d789e63297ee7294c6760ba04a28dd889c52859a05c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trek (0.1.16)
+    trek (0.1.18)
       action_policy (~> 0.6)
       actioncable
       acts_as_list (~> 1.1)

data/README.md

@@ -192,7 +192,7 @@ Then, whenever you change the files in Trek, you'll have to restart the Rails se
 
 When you're done, disable the local version:
 
-    bundle config --delete local.trek
+    bundle config unset --local local.trek
 
 Don't forget to revert to a released verion in your `Gemfile`:
 

data/app/components/trek/entries/item_component/item_component.css

@@ -33,12 +33,12 @@ table .root {
   --icon-size: 1.6rem;
 
   align-items: center;
+  aspect-ratio: 16/9;
   background-color: var(--slate-3);
   border: 1px solid var(--slate-a3);
   border-radius: 0.2rem;
   color: var(--slate-8);
   display: flex;
-  aspect-ratio: 16/9;
   justify-content: center;
   margin-right: 2rem;
   overflow: hidden;

data/app/components/trek/form/actions_component.rb

@@ -9,6 +9,21 @@ module Trek
       renders_many :buttons, Trek::ButtonComponent
       renders_many :links, "LinkComponent"
 
+      def with_delete_button(object:, model_collection:)
+        return unless object.persisted? && helpers.allowed_to?(:destroy?, object)
+
+        with_button(
+          text: helpers.t("admin.actions.delete"),
+          to: [:admin, object],
+          method: :delete,
+          data: {
+            turbo_confirm: helpers.t("admin.#{model_collection}.destroy.confirm")
+          },
+          color: :tomato,
+          position: :right,
+        )
+      end
+
       def classes
         class_names_for(
           root_class,

data/app/components/trek/form/content_editor_component/content_editor_component.html.slim

@@ -211,28 +211,27 @@ div(
         class=class_for("floating-menu")
         data=stimulus_target_hash("floatingMenu")
       )
-        / TODO: re-enable floating buttons
-        / button(
-        /   class=class_for("button")
-        /   type="button"
-        /   data-action=stimulus_action("togglePrompts")
-        / )
-        /   = render Trek::IconComponent.new( \
-        /       "trek/cursor",
-        /       classnames: class_for("button-icon"),
-        /     )
-        /   = t(".prompt")
-
-        / button(
-        /   class=class_for("button")
-        /   type="button"
-        /   data-action=stimulus_action("toggleImage")
-        / )
-        /   = render Trek::IconComponent.new( \
-        /       "trek/pic",
-        /       classnames: class_for("button-icon"),
-        /     )
-        /   = t(".image")
+        button(
+          class=class_for("button")
+          type="button"
+          data-action=stimulus_action("togglePrompts")
+        )
+          = render Trek::IconComponent.new( \
+              "trek/cursor",
+              classnames: class_for("button-icon"),
+            )
+          = t(".prompt")
+
+        button(
+          class=class_for("button")
+          type="button"
+          data-action=stimulus_action("toggleImage")
+        )
+          = render Trek::IconComponent.new( \
+              "trek/pic",
+              classnames: class_for("button-icon"),
+            )
+          = t(".image")
 
       = link_to "",
                 new_prompt_path,

data/app/components/trek/form/content_editor_component/content_editor_component.js

@@ -259,12 +259,66 @@ export class Controller extends BaseController {
 
   contentInserterTargetConnected(t) {
     const content = t.innerHTML;
-    this.editor.commands.insertContent(content);
+
+    if (this._editingImagePos != null) {
+      // Update existing image block in place
+      const pos = this._editingImagePos;
+      this._editingImagePos = null;
+
+      const parser = new DOMParser();
+      const doc = parser.parseFromString(content, "text/html");
+      const imageBlock = doc.querySelector("image-block");
+
+      if (imageBlock) {
+        const attrs = {};
+        for (const attr of imageBlock.attributes) {
+          attrs[attr.name] = attr.value;
+        }
+        const tr = this.editor.state.tr;
+        const node = this.editor.state.doc.nodeAt(pos);
+        if (node && node.type.name === "imageBlock") {
+          tr.setNodeMarkup(pos, undefined, attrs);
+          this.editor.view.dispatch(tr);
+        } else {
+          this.editor.commands.insertContent(content);
+        }
+      } else {
+        this.editor.commands.insertContent(content);
+      }
+    } else {
+      this.editor.commands.insertContent(content);
+    }
+
     t.parentNode.removeChild(t);
   }
 
   toggleImage(e) {
-    const params = e.target.closest("button").dataset.params;
+    const button = e.target.closest("button");
+    const params = button.dataset.params;
+
+    // Check if clicking an existing image block in the editor
+    const imageBlockEl = button.closest("image-block");
+    if (imageBlockEl) {
+      const pos = this.editor.view.posAtDOM(imageBlockEl, 0);
+      const resolved = this.editor.state.doc.resolve(pos);
+      // Walk up to find the imageBlock node position
+      for (let d = resolved.depth; d >= 0; d--) {
+        if (resolved.node(d).type.name === "imageBlock") {
+          this._editingImagePos = d > 0 ? resolved.before(d) : pos;
+          break;
+        }
+      }
+      // Fallback: the pos itself might point at the imageBlock
+      if (this._editingImagePos == null) {
+        const node = this.editor.state.doc.nodeAt(pos);
+        if (node && node.type.name === "imageBlock") {
+          this._editingImagePos = pos;
+        }
+      }
+    } else {
+      this._editingImagePos = null;
+    }
+
     const url = this.hiddenImageButtonTarget.dataset.basePath;
     this.hiddenImageButtonTarget.href = url + (params ? "&" + params : "");
     this.hiddenImageButtonTarget.click();

data/app/components/trek/form/content_editor_component/extensions/image_block.js

@@ -48,7 +48,14 @@ export default Node.create({
   },
 
   addNodeView() {
-    return ({ node }) => {
+    return ({
+      editor,
+      node,
+      getPos,
+      HTMLAttributes,
+      decorations,
+      extension,
+    }) => {
       const dom = document.createElement("image-block");
       const params = attributesToParams(node.attrs);
 

data/app/components/trek/form/content_editor_component/extensions/prompts_block.js

@@ -45,7 +45,14 @@ export default Node.create({
   },
 
   addNodeView() {
-    return ({ node }) => {
+    return ({
+      editor,
+      node,
+      getPos,
+      HTMLAttributes,
+      decorations,
+      extension,
+    }) => {
       const dom = document.createElement("prompts-block");
       const params = attributesToParams(node.attrs);
 

data/app/components/trek/header_component.rb

@@ -3,7 +3,6 @@
 module Trek
   class HeaderComponent < Trek::Component
     extend Dry::Initializer
-    include Trek::PagePathHelper if defined?(Page)
     include ActionPolicy::Behaviour
 
     option :current_object, optional: true

data/app/components/trek/search_component/search_component.css

@@ -2,6 +2,7 @@
 .root {
   align-items: center;
   display: flex;
+  margin-bottom: 2.4rem;
 }
 
 .label {
@@ -14,6 +15,7 @@
   border-radius: 0.8rem;
   display: flex;
   transition: border-color 0.2s ease-in-out;
+  width: 36rem;
 }
 
 .wrapper:focus-within {
@@ -25,8 +27,10 @@
   background: transparent;
   border: 0;
   color: var(--slate-11);
+  flex-grow: 1;
   font-size: 1.6rem;
   font-weight: var(--regular);
+  margin-right: 1rem;
   padding: 1rem 2rem;
   transition: color 0.2s ease-in-out;
 }
@@ -42,15 +46,14 @@
   appearance: none;
   background-color: transparent;
   border: none;
-  border-radius: 0.8rem;
+  border-radius: 0 0.8rem 0.8rem 0;
   color: var(--slate-11);
   cursor: pointer;
   display: inline-flex;
   font-size: 1.6rem;
   font-weight: var(--regular);
   line-height: 1.25;
-  margin-left: 1rem;
-  padding: 1rem 2rem;
+  padding: 1rem 1.4rem;
   text-decoration: none;
   transition: background-color 0.2s ease-in-out, border-color 0.2s ease-in-out,
     color 0.2s ease-in-out;
@@ -59,4 +62,26 @@
 .button:hover {
   background-color: var(--accent-3);
   border-color: var(--accent-5);
+  color: var(--accent-11);
+}
+
+.reset {
+  --icon-size: 1.6rem;
+
+  align-items: center;
+  appearance: none;
+  background-color: transparent;
+  border: none;
+  border-radius: 0;
+  color: var(--slate-11);
+  cursor: pointer;
+  display: inline-flex;
+  padding: 1rem 1.4rem;
+  text-decoration: none;
+  transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out;
+}
+
+.reset:hover {
+  background-color: var(--accent-3);
+  color: var(--accent-11);
 }

data/app/components/trek/search_component/search_component.html.slim

@@ -7,5 +7,8 @@
       value=value
       class=class_for("input")
     )
+    - if value.present?
+      = link_to action, class: class_for("reset"), title: t(".reset")
+        = render Trek::IconComponent.new("trek/close")
     button(class=class_for("button") type="submit" title=t(".search"))
       = render Trek::IconComponent.new("trek/search")

data/app/formatters/prosemirror_to_html/global_id_to_links_formatter.rb

@@ -1,7 +1,6 @@
 module ProsemirrorToHtml
   class GlobalIdToLinksFormatter
     include Rails.application.routes.url_helpers
-    include Trek::PagePathHelper
 
     GLOBAL_ID_REGEX = %r{(gid://[[:alnum:]]+/[\w:]+/[\w-]+)}
 

data/config/locales/trek.en.yml

@@ -229,6 +229,7 @@ en:
     list_component:
       empty: No item.
     search_component:
+      reset: Reset search
       search: Search
   user:
     locale:

data/config/locales/trek.fr.yml

@@ -233,6 +233,7 @@ fr:
     list_component:
       empty: Aucun élément
     search_component:
+      reset: Réinitialiser la recherche
       search: Rechercher
   user:
     locale:

data/lib/generators/trek/templates/views/admin/pages/_form.html.slim

@@ -101,17 +101,5 @@
         text: t("admin.actions.validate"),
         color: :grass,
       )
-      if @object.persisted? && allowed_to?(:destroy, @object)
-        c.with_button(
-          text: t("admin.actions.delete"),
-          to: [:admin, @object],
-          method: :delete,
-          data: {
-            turbo_confirm: t(
-              "admin.#{model_collection}.destroy.confirm"
-            )
-          },
-          color: :tomato,
-          position: :right,
-        )
-      end
+
+      c.with_delete_button(object: @object, model_collection: model_collection)

data/lib/generators/trek/templates/views/admin/scaffold/_form.html.slim.tt

@@ -20,3 +20,5 @@
         text: t("admin.actions.validate"),
         color: :grass,
       )
+
+      c.with_delete_button(object: @object, model_collection: model_collection)

data/lib/generators/trek/templates/views/admin/users/_form.html.slim

@@ -48,13 +48,4 @@
       color: :grass,
     )
 
-    if @object.persisted? && allowed_to?(:destroy?, @object)
-      c.with_button(
-        text: t("admin.actions.delete"),
-        to: [:admin, @object],
-        method: "delete",
-        data: { turbo_confirm: t("admin.#{model_collection}.destroy.confirm") },
-        color: :tomato,
-        position: :right,
-      )
-    end
+    c.with_delete_button(object: @object, model_collection: model_collection)

data/lib/trek/typography_formatter.rb

@@ -1,16 +1,18 @@
 module Trek
-  # `TypographyFormatter` formats strings to enforce typography rules.
-  # For now, only French typography rules about non-breaking spaces
-  # and ellipsis are implemented.
+  # `TypographyFormatter` formats strings to enforce French typography rules.
   #
   # Supports both plain strings and ProseMirror JSONB hashes. When given
   # a Hash, it walks the node tree and formats only `text` node values
   # in place, leaving the structure intact.
   class TypographyFormatter
     NBSP = [160].pack("U*").freeze
-    NBSP_BEFORE_CHARS = %w[: ; % € \$ °C °F » ! \? –].freeze
-    NBSP_AFTER_CHARS = %w[«].freeze
-    NBSP_BEFORE_UNITS = %w[g h ha kg km Ko ko kW L l m min ml Mo mo s].freeze
+    NNBSP = [8239].pack("U*").freeze # U+202F narrow no-break space
+    SPACE_BEFORE_CHARS = [
+      [NBSP, %w[: % € \$ » – —]],
+      [NNBSP, %w[; ! \?]]
+    ].freeze
+    NBSP_AFTER_CHARS = %w[« – —].freeze
+    NBSP_BEFORE_UNITS = %w[°C °F g h ha kg km Ko ko kW L l m min ml Mo mo s].freeze
 
     def initialize(input)
       @source = input
@@ -36,6 +38,8 @@ module Trek
       remove_double_spaces
       add_nbsp
       replace_ellipsis
+      replace_apostrophes
+      remove_spaces_before_attached_punctuation
     end
 
     def format_prosemirror_node(node)
@@ -62,15 +66,19 @@ module Trek
     end
 
     def add_nbsp
-      add_nbsp_before_chars
+      add_nbsp_after_numero
       add_nbsp_before_units
+      add_nbsp_before_degree
+      add_space_before_chars
       add_nbsp_after_chars
       add_nbsp_between_digits
     end
 
-    def add_nbsp_before_chars
-      regexp = /(?<=\S)(\p{Zs}?(#{NBSP_BEFORE_CHARS.join("|")}))/
-      @output.gsub!(regexp, "#{NBSP}\\2")
+    def add_space_before_chars
+      SPACE_BEFORE_CHARS.each do |space, chars|
+        regexp = /(?<=\S)(\p{Zs}?(#{chars.join("|")}))/
+        @output.gsub!(regexp, "#{space}\\2")
+      end
     end
 
     def add_nbsp_before_units
@@ -79,10 +87,18 @@ module Trek
     end
 
     def add_nbsp_after_chars
-      regexp = /((#{NBSP_AFTER_CHARS.join("|")})\p{Zs}?)\b/
+      regexp = /((#{NBSP_AFTER_CHARS.join("|")})\p{Zs}?)(?=\w)/
       @output.gsub!(regexp, "\\2#{NBSP}")
     end
 
+    def add_nbsp_before_degree
+      @output.gsub!(/(\d)\p{Zs}?(°)(?!\w)/, "\\1#{NBSP}\\2")
+    end
+
+    def add_nbsp_after_numero
+      @output.gsub!(/(?i)(n°)\p{Zs}?(?=\d)/, "\\1#{NBSP}")
+    end
+
     def add_nbsp_between_digits
       regexp = /(\d)\p{Zs}(\d)/
       @output.gsub!(regexp, "\\1#{NBSP}\\2")
@@ -91,5 +107,13 @@ module Trek
     def replace_ellipsis
       @output.gsub!("...", "…")
     end
+
+    def replace_apostrophes
+      @output.gsub!(/(?<=\w)'(?=\w)/, "\u2019")
+    end
+
+    def remove_spaces_before_attached_punctuation
+      @output.gsub!(/\p{Zs}+([.,])/, "\\1")
+    end
   end
 end

data/lib/trek/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Trek
-  VERSION = "0.1.16"
+  VERSION = "0.1.18"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etaminstudio/trek",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "A modern CMS for Ruby on Rails",
   "main": "app/javascript/trek.js",
   "repository": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trek
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.18
 platform: ruby
 authors:
 - Mohamed Bengrich