Merge branch 'main' into feature/63_allow_image_tag_loading_to_be_wri…

…tten
nerdgeschoss · Jul 31, 2023 · bb1c893 · bb1c893
2 parents 9b11553 + 8dd518f
commit bb1c893
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/spec/rails_app/app/views/posts/index.html.slim b/spec/rails_app/app/views/posts/index.html.slim
@@ -2,7 +2,7 @@ h1 Posts
 
 p data-controller="hello"
 
-a href=modal_path(new_post_path) Write New Post
+a href=modal_path(new_post_path, size: "custom-size") Write New Post
 
 - @posts.each do |post|
   = image_tag post.image, width: 200, loading: :lazy if post.image.attached?

diff --git a/spec/system/modal_spec.rb b/spec/system/modal_spec.rb
@@ -14,6 +14,7 @@
 
     click_on "Write New Post"
     expect(page).to have_selector ".modal--open"
+    expect(page).to have_selector ".modal--custom-size"
     expect(page).to have_content "Compose Post"
     expect(page).to have_link "Cancel"
 

diff --git a/src/modal.ts b/src/modal.ts
@@ -66,7 +66,11 @@ export class Modal {
     closeButton.style.display = close ?? true ? "block" : "none";
     root.classList.add("modal--open");
     root.classList.add("modal--loading");
-    root.classList.toggle("modal--small", size === "small");
+
+    if (size) {
+      root.classList.add(`modal--${size}`);
+    }
+
     frame.innerHTML = await getHTML(url);
     root.classList.remove("modal--loading");
   }