trek 0.1.17 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ce09d92a68c4819bcee3c5161b1fd0b94cc70c5b9f0b2b27078d2dd25304f0a
-  data.tar.gz: ac8267f5c9835457b0ba96d64efc70bf07dd33b5d0e35d0e3e17187ea5820ea7
+  metadata.gz: c361aedf0c96319053cdbb1e2d80ac77248791c84fedd2f0bb49e89b3d6afa7f
+  data.tar.gz: 40fd5afd6fa1cd82f8095e2164d46f5943c0a723fe79878e4046cb576bb3eba0
 SHA512:
-  metadata.gz: 1e5b14288cf402157249b544f6931253594f1fce504d40a20af920ae3c116f339a877a11db59c34371cce3fb9d689b9153c165d60194783a72c4bae5e539aa65
-  data.tar.gz: 8b98e40d589b12ff0debc7d5b822aaaefe525427d24c08c9c178194ab9aa988a7df96ef919e1cd21d788146a72c0a166a2d71e04f2e8e7f981e7a0d144d22b9f
+  metadata.gz: 37c0db5305f16dfc336b2e9383bb03997dc6613c77a0c797648dd3a77ed2f0300028330b4eae72d2775dbfc407e260b3f8b8877cd3e0c3120b884447b53235cc
+  data.tar.gz: 7a7d98baf92ad4bed55736607976a73af61696381b90252e3f0f63a691dfb31f5b959982c5570a452ec004199c92ea344a12116904049d7dba315c57c6d3b9ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trek (0.1.17)
+    trek (0.1.19)
       action_policy (~> 0.6)
       actioncable
       acts_as_list (~> 1.1)
@@ -320,7 +320,7 @@ GEM
       stringio
     public_suffix (7.0.2)
     racc (1.8.1)
-    rack (3.2.4)
+    rack (3.2.5)
     rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)

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/form/group_component.rb

@@ -10,6 +10,7 @@ module Trek
       attr_reader :object, :model_name, :lookup
 
       def initialize(form, object_name, method_name, options = {})
+        @label = options.delete(:label)
         @hint = options.delete(:hint)
         @lookup = options.delete(:lookup)
         @classnames = options.delete(:classnames)
@@ -40,7 +41,7 @@ module Trek
       end
 
       def label_text
-        label_i18n_keys.translate
+        @label.presence || label_i18n_keys.translate
       end
 
       def label_i18n_keys

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/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/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/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etaminstudio/trek",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "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.17
+  version: 0.1.19
 platform: ruby
 authors:
 - Mohamed Bengrich