proscenium 0.15.0.beta.2-x86_64-darwin → 0.15.0.beta.4-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6051f0c0a8867125f4a6059bd11e76b332236051450a6207e5d402d8977ec58f
-  data.tar.gz: 32f1a4325433c459a4cfc839e6f0ef4453f3bc2f8c1e044f1f0ca6ce2c828fc0
+  metadata.gz: c8fe10f018fd22079605fce2d978031b9f923edb789804a2b80845eee8e78d0e
+  data.tar.gz: a0b5e9633788960be763f301e15f9d9a7a54949e8deac70e3f0abcace630d0e9
 SHA512:
-  metadata.gz: 6df4aa018bf1cf70184d680a56cda8a25ebf03745266a434fe947f2f251e399a593a722c62efeadb0f281168ebc8f6c431fe71df8bb57e73a80edd2d7a67ccc9
-  data.tar.gz: '002806890da6f9387db8af353b52afe4ae709a1dec76181f81e9ec58802114fe5559bd6abddd65403ad0549193748d36830c9c55bbdd4911167cb6a0dc7f72e4'
+  metadata.gz: 4d8bd75a53cd2315ae735942091c60928d70ac46a5ba96a1afc5ea19be20da53cf37debc500a53ae497f3d9afdd67bc170f19fe8d5b1279784b9846cf59ed8ee
+  data.tar.gz: f8e8ea0d947606710ae48fa012b45f0ab95349e6f7b58bc9e2b7b47b2cec413fae8d30d0845fb6495357f4f721d907589a7f3a0d9077ae2b6ba302fd72bb7767

data/lib/proscenium/css_module/rewriter.rb

@@ -8,12 +8,28 @@ module Proscenium
     class Rewriter < RubyNext::Language::Rewriters::Text
       NAME = 'proscenium-css-module'
 
-      def safe_rewrite(source)
-        source.gsub(/:@([\w_]+)/) do |_|
-          context.track! self
+      def rewrite(source)
+        source = source.gsub(/%i\[((@[\w@ ]+)|([\w@ ]+ @[\w@ ]+))\]/) do |_|
+          arr = ::Regexp.last_match(1).split.map do |x|
+            x.start_with?('@') ? css_module_string(x[1..]) : ":#{x}"
+          end
+          "[#{arr.join(',')}]"
+        end
+
+        source.gsub(/:@([\w]+)/) do |_|
+          context.track!(self)
+          css_module_string(::Regexp.last_match(1))
+        end
+      end
+
+      private
 
-          match = ::Regexp.last_match(1)
-          "Proscenium::CssModule::Name.new(:@#{match}, css_module(:#{match}))"
+      def css_module_string(name)
+        if (path = Pathname.new(context.path).sub_ext('.module.css')).exist?
+          tname = Transformer.new(path).class_name!(name, name.dup).first
+          "Proscenium::CssModule::Name.new(:@#{name}, '#{tname}')"
+        else
+          "Proscenium::CssModule::Name.new(:@#{name}, css_module(:#{name}))"
         end
       end
     end

data/lib/proscenium/libs/ujs/class.js

@@ -0,0 +1,17 @@
+import DataConfirm from "./data_confirm";
+import DataDisableWith from "./data_disable_with";
+
+export default class UJS {
+  constructor() {
+    const dc = new DataConfirm();
+    const ddw = new DataDisableWith();
+
+    document.body.addEventListener(
+      "submit",
+      (event) => {
+        dc.onSubmit(event) && ddw.onSubmit(event);
+      },
+      { capture: true }
+    );
+  }
+}

data/lib/proscenium/libs/ujs/data_confirm.js

@@ -0,0 +1,16 @@
+export default class DataConfirm {
+  onSubmit = event => {
+    if (!event.target.matches('[data-turbo=true]') && 'confirm' in event.submitter.dataset) {
+      const v = event.submitter.dataset.confirm
+
+      if (v !== 'false' && !confirm(v === 'true' || v === '' ? 'Are you sure?' : v)) {
+        event.preventDefault()
+        event.stopPropagation()
+        event.stopImmediatePropagation()
+        return false
+      }
+    }
+
+    return true
+  }
+}

data/lib/proscenium/libs/ujs/data_disable_with.js

@@ -0,0 +1,68 @@
+export default class DataDisableWith {
+  onSubmit = event => {
+    const target = event.target
+    const formId = target.id
+
+    if (target.matches('[data-turbo=true]')) return
+
+    const submitElements = Array.from(
+      target.querySelectorAll(
+        ['input[type=submit][data-disable-with]', 'button[type=submit][data-disable-with]'].join(
+          ', '
+        )
+      )
+    )
+
+    submitElements.push(
+      ...Array.from(
+        document.querySelectorAll(
+          [
+            `input[type=submit][data-disable-with][form='${formId}']`,
+            `button[type=submit][data-disable-with][form='${formId}']`
+          ].join(', ')
+        )
+      )
+    )
+
+    for (const ele of submitElements) {
+      if (ele.hasAttribute('form') && ele.getAttribute('form') !== target.id) continue
+
+      this.#disableButton(ele)
+    }
+  }
+
+  #disableButton(ele) {
+    const defaultTextValue = 'Please wait...'
+    let textValue = ele.dataset.disableWith || defaultTextValue
+    if (textValue === 'false') return
+    if (textValue === 'true') {
+      textValue = defaultTextValue
+    }
+
+    ele.disabled = true
+
+    if (ele.matches('button')) {
+      ele.dataset.valueBeforeDisabled = ele.innerHTML
+      ele.innerHTML = textValue
+    } else {
+      ele.dataset.valueBeforeDisabled = ele.value
+      ele.value = textValue
+    }
+
+    if (ele.resetDisableWith === undefined) {
+      // This function can be called on the element to reset the disabled state. Useful for when
+      // form submission fails, and the button should be re-enabled.
+      ele.resetDisableWith = function () {
+        this.disabled = false
+
+        if (this.matches('button')) {
+          this.innerHTML = this.dataset.valueBeforeDisabled
+        } else {
+          this.value = this.dataset.valueBeforeDisabled
+        }
+
+        delete this.dataset.valueBeforeDisabled
+      }
+    }
+  }
+}

data/lib/proscenium/libs/ujs/index.js

@@ -0,0 +1,9 @@
+export default async () => {
+  window.Proscenium = window.Proscenium || {};
+
+  if (!window.Proscenium.UJS) {
+    const classPath = "/@proscenium/ujs/class.js";
+    const module = await import(classPath);
+    window.Proscenium.UJS = new module.default();
+  }
+};

data/lib/proscenium/side_load.rb

@@ -21,6 +21,7 @@ module Proscenium
       end
 
       def capture_and_replace_proscenium_stylesheets # rubocop:disable Metrics/*
+        return if response_body.nil?
         return if response_body.first.blank? || !Proscenium::Importer.css_imported?
         return unless response_body.first.include? '<!-- [PROSCENIUM_STYLESHEETS] -->'
 
@@ -52,6 +53,7 @@ module Proscenium
       end
 
       def capture_and_replace_proscenium_javascripts # rubocop:disable Metrics/*
+        return if response_body.nil?
         return if response_body.first.blank? || !Proscenium::Importer.js_imported?
 
         imports = Proscenium::Importer.imported.dup

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.15.0.beta.2'
+  VERSION = '0.15.0.beta.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.15.0.beta.2
+  version: 0.15.0.beta.4
 platform: x86_64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-23 00:00:00.000000000 Z
+date: 2024-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -118,6 +118,10 @@ files:
 - lib/proscenium/libs/react-manager/react.js
 - lib/proscenium/libs/stimulus-loading.js
 - lib/proscenium/libs/test.js
+- lib/proscenium/libs/ujs/class.js
+- lib/proscenium/libs/ujs/data_confirm.js
+- lib/proscenium/libs/ujs/data_disable_with.js
+- lib/proscenium/libs/ujs/index.js
 - lib/proscenium/log_subscriber.rb
 - lib/proscenium/middleware.rb
 - lib/proscenium/middleware/base.rb