plutonium 0.24.7 → 0.25.1

data/lib/plutonium/action/interactive.rb

@@ -22,6 +22,7 @@ module Plutonium
         options[:label] ||= interaction.label
         options[:description] ||= interaction.description
         options[:icon] ||= interaction.icon
+        options[:turbo_frame] = "remote_modal" unless options.key?(:turbo_frame)
 
         super(name, **options)
       end

data/lib/plutonium/helpers/turbo_helper.rb

@@ -5,8 +5,8 @@ module Plutonium
         request.headers["Turbo-Frame"]
       end
 
-      def modal_frame_tag(&)
-        turbo_frame_tag("modal", &)
+      def remote_modal_frame_tag(&)
+        turbo_frame_tag("remote_modal", &)
       end
     end
   end

data/lib/plutonium/helpers/turbo_stream_actions_helper.rb

@@ -1,7 +1,7 @@
 module Plutonium
   module Helpers
     module TurboStreamActionsHelper
-      def redirect(url)
+      def turbo_stream_redirect(url)
         turbo_stream_action_tag :redirect, url:
       end
     end

data/lib/plutonium/resource/controllers/interactive_actions.rb

@@ -27,7 +27,7 @@ module Plutonium
         def interactive_record_action
           build_interactive_record_action_interaction
 
-          if helpers.current_turbo_frame == "modal"
+          if helpers.current_turbo_frame == "remote_modal"
             render layout: false
           else
             render :interactive_record_action
@@ -56,10 +56,10 @@ module Plutonium
 
                 format.any { redirect_to return_url, status: :see_other }
 
-                if helpers.current_turbo_frame == "modal"
+                if helpers.current_turbo_frame == "remote_modal"
                   format.turbo_stream do
                     render turbo_stream: [
-                      turbo_stream.redirect(return_url)
+                      helpers.turbo_stream_redirect(return_url)
                     ]
                   end
                 end
@@ -73,13 +73,6 @@ module Plutonium
                   render "errors", status: :unprocessable_entity
                 end
 
-                if helpers.current_turbo_frame == "modal"
-                  format.turbo_stream do
-                    render turbo_stream: [
-                      turbo_stream.replace(:modal, partial: "interactive_action_form")
-                    ]
-                  end
-                end
               end
             end
           end
@@ -90,7 +83,7 @@ module Plutonium
           skip_verify_current_authorized_scope!
           build_interactive_resource_action_interaction
 
-          if helpers.current_turbo_frame == "modal"
+          if helpers.current_turbo_frame == "remote_modal"
             render layout: false
           else
             render :interactive_resource_action
@@ -120,10 +113,10 @@ module Plutonium
 
                 format.any { redirect_to return_url, status: :see_other }
 
-                if helpers.current_turbo_frame == "modal"
+                if helpers.current_turbo_frame == "remote_modal"
                   format.turbo_stream do
                     render turbo_stream: [
-                      turbo_stream.redirect(return_url)
+                      helpers.turbo_stream_redirect(return_url)
                     ]
                   end
                 end
@@ -137,13 +130,6 @@ module Plutonium
                   render "errors", status: :unprocessable_entity
                 end
 
-                if helpers.current_turbo_frame == "modal"
-                  format.turbo_stream do
-                    render turbo_stream: [
-                      turbo_stream.replace(:modal, partial: "interactive_action_form")
-                    ]
-                  end
-                end
               end
             end
           end
@@ -156,7 +142,7 @@ module Plutonium
           # interactive_bulk
           # @interaction = current_interactive_action.interaction.new((params[:interaction] || {}).except(:resources))
 
-          # if helpers.current_turbo_frame == "modal"
+          # if helpers.current_turbo_frame == "remote_modal"
           #   render layout: false
           # else
           #   render :interactive_bulk_action
@@ -176,10 +162,10 @@ module Plutonium
           #     flash[:notice] = "TODO:#{current_interactive_action} #{collection_count} #{resource_class.model_name.human.pluralize(collection_count)} successfully updated."
 
           #     format.html { redirect_to resource_url_for(resource_class) }
-          #     if helpers.current_turbo_frame == "modal"
+          #     if helpers.current_turbo_frame == "remote_modal"
           #       format.turbo_stream do
           #         render turbo_stream: [
-          #           turbo_stream.redirect(resource_url_for(resource_class))
+          #           helpers.turbo_stream_redirect(resource_url_for(resource_class))
           #         ]
           #       end
           #     end
@@ -191,12 +177,6 @@ module Plutonium
           #       @errors = @interaction.errors
           #       render "errors", status: :unprocessable_entity
           #     end
-
-          #     if helpers.current_turbo_frame == "modal"
-          #       format.turbo_stream do
-          #         render turbo_stream: turbo_stream.replace(:modal, partial: "interactive_bulk_action_form")
-          #       end
-          #     end
           #   end
           # end
         end

data/lib/plutonium/ui/layout/base.rb

@@ -8,6 +8,7 @@ module Plutonium
         include Phlex::Rails::Helpers::FaviconLinkTag
         include Phlex::Rails::Helpers::StylesheetLinkTag
         include Phlex::Rails::Helpers::JavascriptIncludeTag
+        include Phlex::Rails::Helpers::TurboFrameTag
 
         def view_template(&)
           doctype
@@ -66,6 +67,7 @@ module Plutonium
         end
 
         def render_after_main
+          turbo_frame_tag("remote_modal")
         end
 
         def render_content(&)

data/lib/plutonium/ui/page/interactive_action.rb

@@ -4,6 +4,8 @@ module Plutonium
   module UI
     module Page
       class InteractiveAction < Base
+        include Phlex::Rails::Helpers::TurboFrameTag
+
         private
 
         def page_title
@@ -15,7 +17,27 @@ module Plutonium
         end
 
         def render_default_content
-          render partial("interactive_action_form")
+          if helpers.current_turbo_frame == "remote_modal"
+            dialog(
+              closedby: "any",
+              class: "rounded-md w-full max-w-3xl
+                      bg-white dark:bg-gray-800
+                      border border-gray-200 dark:border-gray-700
+                      shadow-lg dark:shadow-gray-900/20
+                      backdrop:bg-black/60 backdrop:backdrop-blur-sm
+                      top-auto md:top-1/2 md:-translate-y-1/2 left-1/2 -translate-x-1/2
+                      max-h-[80%] p-6
+                      hidden open:flex flex-col
+                      relative opacity-0 open:opacity-100
+                      transition-opacity duration-300 ease-in-out",
+              data: {controller: "remote-modal"}
+            ) do
+              render_page_header
+              render partial("interactive_action_form")
+            end
+          else
+            render partial("interactive_action_form")
+          end
         end
 
         def page_type = :interactive_action_page

data/lib/plutonium/version.rb

@@ -1,5 +1,5 @@
 module Plutonium
-  VERSION = "0.24.7"
+  VERSION = "0.25.1"
   NEXT_MAJOR_VERSION = VERSION.split(".").tap { |v|
     v[1] = v[1].to_i + 1
     v[2] = 0

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Core assets for the Plutonium gem",
   "type": "module",
   "main": "src/js/core.js",

data/src/js/controllers/register_controllers.js

@@ -18,6 +18,7 @@ import AttachmentPreviewController from "./attachment_preview_controller.js"
 import AttachmentPreviewContainerController from "./attachment_preview_container_controller.js"
 import SidebarController from "./sidebar_controller.js"
 import PasswordVisibilityController from "./password_visibility_controller.js"
+import RemoteModalController from "./remote_modal_controller.js"
 
 export default function (application) {
   // Register controllers here
@@ -40,4 +41,5 @@ export default function (application) {
   application.register("attachment-input", AttachmentInputController)
   application.register("attachment-preview", AttachmentPreviewController)
   application.register("attachment-preview-container", AttachmentPreviewContainerController)
+  application.register("remote-modal", RemoteModalController)
 }

data/src/js/controllers/remote_modal_controller.js

@@ -0,0 +1,24 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="remote-modal"
+export default class extends Controller {
+    connect() {
+        // Store original scroll position
+        this.originalScrollPosition = window.scrollY;
+
+        // Show the modal
+        this.element.showModal();
+        // Add close event listener
+        this.element.addEventListener('close', this.handleClose.bind(this));
+    }
+
+    disconnect() {
+        // Clean up event listener when controller is disconnected
+        this.element.removeEventListener('close', this.handleClose);
+    }
+
+    handleClose() {
+        // Restore the original scroll position after dialog closes
+        window.scrollTo(0, this.originalScrollPosition);
+    }
+}

data/src/js/turbo/index.js

@@ -1,5 +1,3 @@
-import * as Turbo from "@hotwired/turbo"
-
-import "./turbo_debug"
-// import "./turbo_actions"
+import "./turbo_actions"
+// import "./turbo_debug"
 // import "./turbo_frame_monkey_patch"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.24.7
+  version: 0.25.1
 platform: ruby
 authors:
 - Stefan Froelich
@@ -911,6 +911,7 @@ files:
 - src/js/controllers/nested_resource_form_fields_controller.js
 - src/js/controllers/password_visibility_controller.js
 - src/js/controllers/register_controllers.js
+- src/js/controllers/remote_modal_controller.js
 - src/js/controllers/resource_collapse_controller.js
 - src/js/controllers/resource_dismiss_controller.js
 - src/js/controllers/resource_drop_down_controller.js