cocoawebview 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 643ce577a44fe54d0867d7a1586bb09bdcc8b8a1d0ae26f9e787fade103a525d
-  data.tar.gz: e76f126629df47a94301a706b9e8f6870c0d19bfa4034fc4f6bb409b20029a2b
+  metadata.gz: f69adb840f4e0a253d570a08155b78718676ad46ee5774d51f4e9a4130f02b27
+  data.tar.gz: f3299408dc6712453b62cdda86bf8a9eb7c8e42d631201e2ac6823dcb319c39a
 SHA512:
-  metadata.gz: b99b40bcab82dc562da9f5c3d0a4b085fc32066651cd551cd3aba5f3f416cf07fc4326f5ef6a9348356fb4a15208ecde9dd67ddb04f87e7ddb851d4a15ee8827
-  data.tar.gz: f5e2323e5d2116388ed9be1f972a6269997dd3f7264d7d23773e0cda8c0a04d0b7a1e8eb5ee0fabfdc6d5313a769d50f3aea199ee84384274da2636ac6055827
+  metadata.gz: 46debf5c14c10abd9f9a179727eb9a5ca868e8ce491cfee673bf54ac0612fea967194d743194bf4b57737ed2f5495c4c0215b8490f08896552b1781f8b4ed6ca
+  data.tar.gz: dab7764310762b5eba6cdc6f68824d68d8c97cdea53a2a1c956ae3c7dabc3b90051cc1d15deda41b1cd23e9c5466b7731dbee386c27568112d3f890aa297a0ea

data/ext/cocoawebview/cocoawebview.m

@@ -24,13 +24,61 @@ VALUE webview_set_title(VALUE self, VALUE title);
 VALUE webview_center(VALUE self);
 VALUE webview_is_visible(VALUE self);
 VALUE webview_set_topmost(VALUE self, VALUE topmost);
-VALUE webview_start_drag_drop(VALUE self);
+
+@interface FileDropContainerView : NSView {
+    VALUE rb_cocoawebview;
+}
+
+- (void)setObj:(VALUE)o;
+@end
+
+@implementation FileDropContainerView
+
+- (instancetype)initWithFrame:(NSRect)frame {
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self registerForDraggedTypes:@[NSPasteboardTypeFileURL]];
+    }
+    return self;
+}
+
+- (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender {
+    return NSDragOperationCopy;
+}
+
+- (BOOL)prepareForDragOperation:(id<NSDraggingInfo>)sender {
+    return YES;
+}
+
+- (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
+    NSPasteboard *pasteboard = [sender draggingPasteboard];
+    NSArray<NSURL *> *fileURLs = [pasteboard readObjectsForClasses:@[[NSURL class]]
+                                                           options:@{NSPasteboardURLReadingFileURLsOnlyKey: @YES}];
+
+    if (fileURLs.count > 0) {
+        NSString *filePath = fileURLs[0].path;
+        VALUE ruby_file_path = rb_str_new_cstr([filePath UTF8String]);
+        rb_funcall(rb_cocoawebview, rb_intern("file_did_drop"), 1, ruby_file_path);
+        return YES;
+    }
+    return NO;
+}
+
+- (void)setObj:(VALUE)o {
+    rb_cocoawebview = o;
+}
+@end
 
 @interface CocoaWKWebView : WKWebView
 @property (nonatomic, strong) NSEvent *lastMouseDownEvent;
 @end
 
 @implementation CocoaWKWebView
+
+- (void)mouseDown:(NSEvent *)event {
+    self.lastMouseDownEvent = event;
+    [super mouseDown:event];
+}
 @end
 
 
@@ -50,11 +98,12 @@ VALUE webview_start_drag_drop(VALUE self);
 }
 @end
 
-@interface CocoaWebview : NSWindow <WKScriptMessageHandler, NSDraggingSource> {
+@interface CocoaWebview : NSWindow <WKScriptMessageHandler> {
     CocoaWKWebView *webView;
     VALUE rb_cocoawebview;
     BOOL showDevTool;
     BOOL shouldMoveTitleButtons;
+    FileDropContainerView *fileDropView;
 }
 - (void)setShouldMoveTitleButtons:(BOOL)flag;
 - (void)setDevTool:(BOOL)flag;
@@ -62,7 +111,6 @@ VALUE webview_start_drag_drop(VALUE self);
 - (void)eval:(NSString*)code;
 - (void)setCocoaWebview:(VALUE)view;
 - (void)dragging;
-- (void)beginNativeFileDrag;
 @end
 
 @implementation CocoaWebview
@@ -90,40 +138,6 @@ VALUE webview_start_drag_drop(VALUE self);
     return self;
 }
 
-- (void)beginNativeFileDrag {
-    NSString *filePath = @"/Users/rkt/Music/1.mp3";
-    NSURL *fileURL = [NSURL fileURLWithPath:filePath];
-
-    if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]) {
-        NSLog(@"File doesn't exist");
-        return;
-    }
-
-    NSPasteboardItem *item = [[NSPasteboardItem alloc] init];
-    [item setString:filePath forType:NSPasteboardTypeFileURL];
-
-    NSDraggingItem *dragItem = [[NSDraggingItem alloc] initWithPasteboardWriter:fileURL];
-
-    NSRect draggingRect = NSMakeRect(0, 0, 100, 30);
-    NSImage *dragImage = [[NSImage alloc] initWithSize:draggingRect.size];
-    [dragImage lockFocus];
-    [[NSColor grayColor] set];
-    NSRectFill(draggingRect);
-    [dragImage unlockFocus];
-
-    [dragItem setDraggingFrame:draggingRect contents:dragImage];
-
-    NSDraggingSession *session = [webView beginDraggingSessionWithItems:@[dragItem]
-                                                                      event:[NSApp currentEvent]
-                                                                     source:self];
-    session.animatesToStartingPositionsOnCancelOrFail = YES;
-    session.draggingFormation = NSDraggingFormationDefault;
-}
-
-- (NSDragOperation)draggingSession:(NSDraggingSession *)session sourceOperationMaskForDraggingContext:(NSDraggingContext)context {
-    return NSDragOperationCopy;
-}
-
 - (void)setShouldMoveTitleButtons:(BOOL)flag {
     shouldMoveTitleButtons = flag;
 }
@@ -177,6 +191,7 @@ VALUE webview_start_drag_drop(VALUE self);
 
 - (void)setCocoaWebview:(VALUE)view {
     rb_cocoawebview = view;
+    [fileDropView setObj:view];
 }
 
 - (void)eval:(NSString*)code {
@@ -188,6 +203,11 @@ VALUE webview_start_drag_drop(VALUE self);
 }
 
 - (void)addWebViewToWindow:(NSWindow *)window {
+    NSRect contentRect = [[window contentView] bounds];
+
+    fileDropView = [[FileDropContainerView alloc] initWithFrame:contentRect];
+    fileDropView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+
     WKUserContentController *userContentController = [[WKUserContentController alloc] init];
     [userContentController addScriptMessageHandler:self name:@"native"];
 
@@ -206,7 +226,6 @@ VALUE webview_start_drag_drop(VALUE self);
     [[config preferences] setValue:@YES forKey:@"DOMPasteAllowed"];
 
     // Create the WKWebView with the configuration
-    NSRect contentRect = [[window contentView] bounds];
     webView = [[CocoaWKWebView alloc] initWithFrame:contentRect configuration:config];
 
     // Enable autoresizing
@@ -220,7 +239,9 @@ VALUE webview_start_drag_drop(VALUE self);
     */
 
     // Add to window's contentView
-    [window setContentView:webView];
+    //[[window contentView] addSubview:fileDropView];
+    [[window contentView] addSubview: webView];
+    [[window contentView] addSubview:fileDropView positioned:NSWindowAbove relativeTo:webView];
 
     webView.navigationDelegate = self;
 }
@@ -268,7 +289,6 @@ Init_cocoawebview(void)
   rb_define_method(rb_mCocoaWebviewClass, "center", webview_center, 0);
   rb_define_method(rb_mCocoaWebviewClass, "visible?", webview_is_visible, 0);
   rb_define_method(rb_mCocoaWebviewClass, "set_topmost", webview_set_topmost, 1);
-  rb_define_method(rb_mCocoaWebviewClass, "start_drag_drop", webview_start_drag_drop, 0);
 
 }
 
@@ -456,11 +476,3 @@ VALUE webview_set_topmost(VALUE self, VALUE topmost) {
         [webview setLevel:NSNormalWindowLevel];
     }
 }
-
-VALUE webview_start_drag_drop(VALUE self) {
-    VALUE wrapper = rb_ivar_get(self, rb_intern("@webview"));
-    CocoaWebview *webview;
-    TypedData_Get_Struct(wrapper, CocoaWebview, &cocoawebview_obj_type, webview);
-
-    [webview beginNativeFileDrag];
-}

data/lib/cocoawebview/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cocoawebview
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

data/lib/cocoawebview.rb

@@ -46,6 +46,10 @@ module CocoaWebview
       puts "CocoaWebview did loaded"
     end
 
+    def file_did_drop(file_path)
+      puts "#{file_path} dropped"
+    end
+
     def bind(name, &block)
       param_info = block.parameters
       param_count = param_info.count { |type, _| type == :req || type == :opt }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoawebview
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Tommy Jeff