pages_core 3.15.1 → 3.15.2

data/app/javascript/components/drag/useDragCollection.ts

@@ -12,10 +12,15 @@ function getPosition<T>(draggable: Drag.Draggable<T>) {
 }
 
 function hideDraggable<T>(
-  draggable: Drag.Draggable<T> | null,
-  callback: () => Drag.Draggable<T>[]
+  draggable: Drag.Item<T> | null,
+  callback: () => Drag.Item<T>[]
 ) {
-  if (draggable && "ref" in draggable && draggable.ref.current) {
+  if (
+    draggable &&
+    draggable !== "Files" &&
+    "ref" in draggable &&
+    draggable.ref.current
+  ) {
     const prevDisplay = draggable.ref.current.style.display;
     draggable.ref.current.style.display = "none";
     const result = callback();

data/app/javascript/components/drag/useDragUploader.ts

@@ -42,7 +42,7 @@ function mousePosition(evt: AnyTouchEvent): Drag.Position {
   if ("touches" in evt && evt.type == "touchmove") {
     x = evt.touches[0].clientX;
     y = evt.touches[0].clientY;
-  } else if (evt instanceof MouseEvent) {
+  } else if ("clientX" in evt && "clientY" in evt) {
     x = evt.clientX;
     y = evt.clientY;
   }

data/app/models/concerns/pages_core/page_model/attachments.rb

@@ -33,6 +33,11 @@ module PagesCore
         super.in_locale(locale)
       end
 
+      def page_files_attributes=(attrs)
+        ids = page_files.map(&:id)
+        super(attrs.reject { |a| a["_destroy"] && ids.exclude?(a["id"]) })
+      end
+
       def files
         page_files
       end

data/app/models/concerns/pages_core/page_model/images.rb

@@ -19,11 +19,11 @@ module PagesCore
 
         after_save :update_primary_image
 
-        accepts_nested_attributes_for :page_images,
-                                      reject_if: proc { |a|
-                                                   a["image_id"].blank?
-                                                 },
-                                      allow_destroy: true
+        accepts_nested_attributes_for(
+          :page_images,
+          reject_if: proc { |a| a["image_id"].blank? },
+          allow_destroy: true
+        )
       end
 
       def image?
@@ -42,6 +42,11 @@ module PagesCore
         super.in_locale(locale)
       end
 
+      def page_images_attributes=(attrs)
+        ids = page_images.map(&:id)
+        super(attrs.reject { |a| a["_destroy"] && ids.exclude?(a["id"]) })
+      end
+
       private
 
       def update_primary_image

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pages_core
 version: !ruby/object:Gem::Version
-  version: 3.15.1
+  version: 3.15.2
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-07 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails