satis 2.4.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d24982732d14eac101cca9cfa2d3cc5e3307b6858b59e2bfeb542a8f487d651a
-  data.tar.gz: decd649c7dadbb2206236d9cf0e452a0e39fe09abbed919daa15f808ac762079
+  metadata.gz: 2c8b8f688d732d57a4df263b47f48f1b072f709c1d9ae5b224cc1e7197e5fc08
+  data.tar.gz: 42d9edfb45401ad6cb797ffa95195acceff18b3a1aa8b8931c95d29afacba49f
 SHA512:
-  metadata.gz: 97ea139e33af026ab3125936279fd5f3f14791b86ce10fe126ee6381b0a9edbf05d6d4eb83cd951a4176474f0190fe761ba4c4c3459792064cb3afb8e14536d6
-  data.tar.gz: fa5477988669b89a1cc0b1ed439d31a3667af430061139447df29543fac809ae9c7d7cecc6d3b0dfd25b48cdc8351476c364979c987f93ebd433030032238b4d
+  metadata.gz: 4bbf1820f21de79035eb8c5285de9ac084f7609a1b33ba57dc8261592d65d122e79d73d808d772aa40b55d1dddc60962b218e7803bb2798c51b506d057186b38
+  data.tar.gz: ac095ab29b95766986c70e2f15322a4f1e16cfc8014ee365b56fc58e628ced330392eddb6b5f67479b3637d8e0004153b58329bbe2c9a7ea7dc3d13038ee86ee

data/app/components/satis/application_component.rb

@@ -21,6 +21,15 @@ module Satis
       super()
     end
 
+    def render_in(view_context, &)
+      self.original_view_context ||= view_context
+      self.original_virtual_path ||= Satis.current_original_virtual_path.presence || view_context.instance_variable_get(:@virtual_path)
+
+      Satis.with_original_virtual_path(original_virtual_path) do
+        super
+      end
+    end
+
     def component_name
       self.class.name.sub(/::Component$/, "").sub(/^Satis::/, "").underscore
     end

data/app/components/satis/tabs/component.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-# FIXME:
-# translation scope seems wrong:
-#   old/okay) title="translation missing: en.users.edit.card.profile.tab.about"
-# new/broken) title="translation missing: en.users.edit.tabs.main.tab.about"
-
 module Satis
   module Tabs
     class Component < Satis::ApplicationComponent

data/app/javascript/satis/utility_controllers/toggle_controller.js

@@ -1,4 +1,4 @@
-import ApplicationController from "satis/controllers/application_controller"
+import ApplicationController from "satis/controllers/application_controller";
 
 /*
   Usage:
@@ -26,20 +26,20 @@ import ApplicationController from "satis/controllers/application_controller"
       = address_form.input :company_name
  */
 export default class extends ApplicationController {
-  static targets = ["toggleable", "insertion", "input"]
+  static targets = ["toggleable", "insertion", "input"];
 
   connect() {
-    this.boundUpdate = this.update.bind(this)
+    this.boundUpdate = this.update.bind(this);
     this.inputTargets.forEach((input) => {
-      input.addEventListener("change", this.boundUpdate)
-    })
-    this.update()
+      input.addEventListener("change", this.boundUpdate);
+    });
+    this.update();
   }
 
   disconnect() {
     this.inputTargets.forEach((input) => {
-      input.removeEventListener("change", this.boundUpdate)
-    })
+      input.removeEventListener("change", this.boundUpdate);
+    });
   }
 
   update(event) {
@@ -48,61 +48,72 @@ export default class extends ApplicationController {
      * process before we overwrite the template nodes that are possibly updated and reinsert new nodes.
      */
     setTimeout(() => {
-      this.toggle(this.currentValue)
-    })
+      this.toggle(this.currentValue);
+    });
   }
 
   toggle(value) {
     // Update template nodes before we swap
     this.toggleableTargets.forEach((target) => {
-      target.content.childNodes.forEach(child => {
-        let targetNodeId = child.getAttribute("data-toggleable-node-id")
+      target.content.childNodes.forEach((child) => {
+        if (typeof child.getAttribute != "function") return;
+        let targetNodeId = child.getAttribute("data-toggleable-node-id");
         if (!targetNodeId) return true;
 
-        this.insertionTarget.childNodes.forEach(iNode => {
+        this.insertionTarget.childNodes.forEach((iNode) => {
           if (iNode.getAttribute("data-toggleable-node-id") == targetNodeId) {
             if (child.parentElement) {
-              child.outerHTML = iNode.outerHTML
-              iNode.remove()
+              child.outerHTML = iNode.outerHTML;
+              iNode.remove();
             }
           }
-        })
-      })
-    })
+        });
+      });
+    });
 
     // Clear the insertion target
-    this.insertionTarget.innerHTML = ""
+    this.insertionTarget.innerHTML = "";
 
     // Reinsert elements
     this.toggleableTargets.forEach((element) => {
-      if (element.getAttribute("data-toggle-value") == value || (element.getAttribute("data-toggle-not-value") != null && element.getAttribute("data-toggle-not-value") != value)) {
-        element.content.childNodes.forEach(node => this.setUniqueId(node))
+      if (
+        element.getAttribute("data-toggle-value") == value ||
+        (element.getAttribute("data-toggle-not-value") != null &&
+          element.getAttribute("data-toggle-not-value") != value)
+      ) {
+        element.content.childNodes.forEach((node) => this.setUniqueId(node));
 
-        let toggleContent = document.importNode(element.content, true)
+        let toggleContent = document.importNode(element.content, true);
         toggleContent.childNodes.forEach((child) => {
-          this.insertionTarget.insertAdjacentHTML("beforeend", child.outerHTML)
-        })
+          if (typeof child.outerHTML != "undefined") {
+            this.insertionTarget.insertAdjacentHTML(
+              "beforeend",
+              child.outerHTML,
+            );
+          }
+        });
       }
-    })
+    });
   }
 
   get currentValue() {
     if (this.inputTargets.length >= 1 && this.inputTargets[0].type == "radio") {
-      return this.inputTargets.find((input) => input.checked)?.value
+      return this.inputTargets.find((input) => input.checked)?.value;
     } else if (this.inputTarget.type == "checkbox") {
-      return this.inputTarget.checked ? "true" : "false"
+      return this.inputTarget.checked ? "true" : "false";
     } else if (this.inputTarget.tagName == "SELECT" && this.data.get("attr")) {
-      let option = this.inputTarget.options[this.inputTarget.selectedIndex]
-      return option?.getAttribute(this.data.get("attr"))
+      let option = this.inputTarget.options[this.inputTarget.selectedIndex];
+      return option?.getAttribute(this.data.get("attr"));
     } else {
-      return this.inputTarget.value
+      return this.inputTarget.value;
     }
   }
 
   setUniqueId(node) {
+    if (typeof node.getAttribute != "function") return;
     if (node.getAttribute("data-toggleable-node-id")) return;
     const dateString = Date.now().toString(36);
     const randomness = Math.random().toString(36).substring(2);
-    node.setAttribute("data-toggleable-node-id", dateString + randomness)
+    node.setAttribute("data-toggleable-node-id", dateString + randomness);
   }
 }

data/lib/satis/concerns/contextual_translations.rb

@@ -8,6 +8,8 @@ module Satis
       extend ActiveSupport::Concern
 
       included do
+        attr_accessor :original_virtual_path
+
         #
         # This provides us with a translation helper which scopes into the original view
         # and thereby conveniently scopes the translations.
@@ -24,8 +26,7 @@ module Satis
         #
         def ct(key = nil, **options)
           key = "#{full_i18n_scope(options).join('.')}#{key}" if key.start_with?('.')
-
-          original_view_context.t(key, **options)
+          original_view_context.controller.t(key, **options)
         end
 
         def full_i18n_scope(options = {})
@@ -41,12 +42,24 @@ module Satis
           @full_i18n_scope
         end
 
-        def original_virtual_path
-          original_view_context.instance_variable_get(:@virtual_path)
+        def original_i18n_scope
+          virtual_path = original_virtual_path.presence || original_view_context_virtual_path
+
+          return virtual_path.gsub(%r{/_?}, ".").split(".") if virtual_path.present? && !satis_component_virtual_path?(virtual_path)
+
+          [original_view_context.controller_path.tr("/", "."), original_view_context.action_name]
+        end
+
+        def satis_component_virtual_path?(virtual_path)
+          virtual_path.start_with?("satis/")
         end
 
-        def original_i18n_scope
-          original_virtual_path.sub(%r{^/}, '').gsub(%r{/_?}, '.').split('.')
+        def original_view_context_virtual_path
+          if original_view_context.respond_to?(:virtual_path)
+            original_view_context.virtual_path
+          elsif original_view_context.instance_variable_defined?(:@virtual_path)
+            original_view_context.instance_variable_get(:@virtual_path)
+          end
         end
 
         def i18n_scope
@@ -55,4 +68,4 @@ module Satis
       end
     end
   end
-end
+end

data/lib/satis/helpers/container.rb

@@ -78,7 +78,6 @@ module Satis
           else
             component.new(*original_args, **kwargs)
           end
-          instance.original_view_context = action_view
           action_view.render(instance, &block)
         end
       end

data/lib/satis/version.rb

@@ -1,3 +1,3 @@
 module Satis
-  VERSION = "2.4.0"
+  VERSION = "2.4.2"
 end

data/lib/satis.rb

@@ -27,6 +27,21 @@ module Satis
       Satis::Helpers::Container.add_helper(name, component)
     end
 
+    def current_original_virtual_path
+      original_virtual_path_stack.last
+    end
+
+    def with_original_virtual_path(virtual_path)
+      original_virtual_path_stack.push(virtual_path)
+      yield
+    ensure
+      original_virtual_path_stack.pop
+    end
+
+    def original_virtual_path_stack
+      Thread.current[:satis_original_virtual_path_stack] ||= []
+    end
+
     def add_component_helper(component_name, name, component)
       klass = "Satis::#{component_name.to_s.classify}::Component".safe_constantize
       return if klass.blank?

data/mise.toml

@@ -0,0 +1,4 @@
+[tools]
+node = "24"
+ruby = "3.4.7"
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: satis
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.2
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-15 00:00:00.000000000 Z
+date: 2026-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser
@@ -934,6 +934,7 @@ files:
 - lib/satis/satisfied.rb
 - lib/satis/version.rb
 - lib/tasks/satis_tasks.rake
+- mise.toml
 - package.json
 - satis.gemspec
 - vendor/javascript/@codemirror--autocomplete.js